I have reverted all contributions made by Jesse Towner in revision 110724 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@119383 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/utility b/include/utility index 1c1e4a3..3a6847a 100644 --- a/include/utility +++ b/include/utility
@@ -218,8 +218,6 @@ second(_STD::forward<_U2>(__u2)) {} -#ifndef _LIBCPP_HAS_NO_VARIADICS - template<class _Tuple, class = typename enable_if<__tuple_convertible<_Tuple, pair>::value>::type> _LIBCPP_INLINE_VISIBILITY @@ -230,6 +228,8 @@ typename __make_tuple_types<_Tuple>::type>::type>(get<1>(__p))) {} +#ifndef _LIBCPP_HAS_NO_VARIADICS + template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2> _LIBCPP_INLINE_VISIBILITY pair(piecewise_construct_t __pc, tuple<_Args1...> __first_args, @@ -239,6 +239,8 @@ typename __make_tuple_indices<sizeof...(_Args2) >::type()) {} +#endif // _LIBCPP_HAS_NO_VARIADICS + template <class _Tuple, class = typename enable_if<__tuple_assignable<_Tuple, pair>::value>::type> _LIBCPP_INLINE_VISIBILITY @@ -253,8 +255,6 @@ return *this; } -#endif // _LIBCPP_HAS_NO_VARIADICS - #else // _LIBCPP_HAS_NO_RVALUE_REFERENCES template<class _U1, class _U2> _LIBCPP_INLINE_VISIBILITY pair(const pair<_U1, _U2>& __p) 